feat: add schema update to table metadata builder #437
+514
−26
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
gty404
force-pushed
the
update-schema
branch
from
7836c3e to
62960f3
Compare
HeartLinked
reviewed
Dec 25, 2025
| const std::vector<int32_t>& schema_ids() const { return schema_ids_; } | ||
| const std::unordered_set<int32_t>& schema_ids() const { return schema_ids_; } | ||
|
|
||
| void ApplyTo(TableMetadataBuilder& builder) const override; |
Contributor
There was a problem hiding this comment.
What about implement applyTo here? Although the table update doesn’t seem to be invoked in the current architecture and may need refactoring , I think it makes sense to implement it here.
WZhuo
reviewed
Dec 25, 2025
Comment on lines
+161
to
+164
| auto name = std::string(partition_field.name()); | ||
| if (name.empty()) { | ||
| return InvalidArgument("Cannot use empty partition name: {}", name); | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| auto name = std::string(partition_field.name()); | |
| if (name.empty()) { | |
| return InvalidArgument("Cannot use empty partition name: {}", name); | |
| } | |
| ICEBERG_PRECHECK(!partition_field.name().empty(), "Cannot use empty partition name: {}", name); | |
| auto name = std::string(partition_field.name()); |
| #include "iceberg/util/macros.h" | ||
| #include "iceberg/util/type_util.h" | ||
| #include "iceberg/util/visit_type.h" | ||
| #include "table_metadata.h" |
Contributor
There was a problem hiding this comment.
Suggested change
| #include "table_metadata.h" | |
| #include "iceberg/table_metadata.h" |
Comment on lines
+239
to
+241
| auto max_it = std::ranges::max_element( | ||
| id_to_field.get(), | ||
| [](const auto& lhs, const auto& rhs) { return lhs.first < rhs.first; }); |
Contributor
There was a problem hiding this comment.
Wrapper with a Lazy or a simple std::call_once? Avoid search every time.
| return max_it->first; | ||
| } | ||
|
|
||
| bool Schema::SameSchema(const Schema& other) const { return fields_ == other.fields_; } |
Contributor
There was a problem hiding this comment.
Also need compare identifier_fields
Comment on lines
+692
to
+694
| if (!schema_ids_to_remove.contains(current_schema_id)) { | ||
| return InvalidArgument("Cannot remove current schema: {}", current_schema_id); | ||
| } |
Contributor
There was a problem hiding this comment.
Suggested change
| if (!schema_ids_to_remove.contains(current_schema_id)) { | |
| return InvalidArgument("Cannot remove current schema: {}", current_schema_id); | |
| } | |
| ICEBERG_PRECHECK(!schema_ids_to_remove.contains(current_schema_id), "Cannot remove current schema: {}", current_schema_id); |
Comment on lines
+724
to
+731
| std::ranges::find_if(changes_, [new_schema_id](const auto& change) { | ||
| if (change->kind() != TableUpdate::Kind::kAddSchema) { | ||
| return false; | ||
| } | ||
| auto* add_schema = dynamic_cast<table::AddSchema*>(change.get()); | ||
| return add_schema->schema()->schema_id().value_or(Schema::kInitialSchemaId) == | ||
| new_schema_id; | ||
| }) != changes_.cend(); |
Contributor
There was a problem hiding this comment.
Suggested change
| std::ranges::find_if(changes_, [new_schema_id](const auto& change) { | |
| if (change->kind() != TableUpdate::Kind::kAddSchema) { | |
| return false; | |
| } | |
| auto* add_schema = dynamic_cast<table::AddSchema*>(change.get()); | |
| return add_schema->schema()->schema_id().value_or(Schema::kInitialSchemaId) == | |
| new_schema_id; | |
| }) != changes_.cend(); | |
| std::ranges::any_of(changes_, [new_schema_id](const auto& change) { | |
| if (change->kind() != TableUpdate::Kind::kAddSchema) { | |
| return false; | |
| } | |
| auto* add_schema = dynamic_cast<table::AddSchema*>(change.get()); | |
| return add_schema->schema()->schema_id().value_or(Schema::kInitialSchemaId) == | |
| new_schema_id; | |
| }); |
Comment on lines
+737
to
+739
| auto new_schema = std::make_shared<Schema>( | ||
| std::vector<SchemaField>(schema.fields().begin(), schema.fields().end()), | ||
| new_schema_id); |
Contributor
There was a problem hiding this comment.
Lack of identifier_field_ids
Suggested change
| auto new_schema = std::make_shared<Schema>( | |
| std::vector<SchemaField>(schema.fields().begin(), schema.fields().end()), | |
| new_schema_id); | |
| auto new_schema = std::make_shared<Schema>( | |
| schema.fields() | std::ranges::to<std::vector>(), | |
| new_schema_id, schema.IdentifierFieldIds()); |
| ICEBERG_RETURN_UNEXPECTED(schema.Validate(metadata_.format_version)); | ||
|
|
||
| auto new_schema_id = ReuseOrCreateNewSchemaId(schema); | ||
| if (schemas_by_id_.find(new_schema_id) != schemas_by_id_.end()) { |
Contributor
There was a problem hiding this comment.
It also check the metadata_.last_column_id equals to new_last_column_id in Java implement, does it matter?
Comment on lines
+937
to
+938
| ICEBERG_BUILDER_ASSIGN_OR_RETURN(auto schema_id, | ||
| impl_->AddSchema(*schema, new_last_column_id)); |
Contributor
There was a problem hiding this comment.
Suggested change
| ICEBERG_BUILDER_ASSIGN_OR_RETURN(auto schema_id, | |
| impl_->AddSchema(*schema, new_last_column_id)); | |
| ICEBERG_BUILDER_RETURN_IF_ERROR(impl_->AddSchema(*schema, new_last_column_id)); |
schema_id is not used
| static constexpr int64_t kInvalidSequenceNumber = -1; | ||
| static constexpr int64_t kInitialRowId = 0; | ||
|
|
||
| static inline const std::unordered_map<TypeId, int8_t> kMinFormatVersions = {}; |
WZhuo
reviewed
Dec 25, 2025
| Status TableMetadataBuilder::Impl::SetCurrentSchema(int32_t schema_id) { | ||
| if (schema_id == kLastAdded) { | ||
| if (!last_added_schema_id_.has_value()) { | ||
| return InvalidArgument("Cannot set last added schema: no schema has been added"); |
Contributor
There was a problem hiding this comment.
Suggested change
| return InvalidArgument("Cannot set last added schema: no schema has been added"); | |
| return ValidationFailed("Cannot set last added schema: no schema has been added"); |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
No description provided.